modified architecture to support master functionality
Authored by: nnovic 2013-10-04
Parent: [r127]
Child: [r129]