Refactored broadcast brick class hierarchy