updated for new service authorization scheme