Add support for custom tasks/brokers