Broker auth working fully, simplify scope methods