Removed broker, added interface