Updated single broker functionality