refactored broker to consolidate service dispatch