Getting rid of BehaviorBuilder