Added automatic broker creation