Added back simple service token abstractions