add const for user class string and helper functions
Merge branch 'stage'