adds more user class support