Add scope limit and expiration support to the broker