Fixed issue with getter/setter racing condition
Removed broadcaster and moved it internally