Added in user and roles admin logic from sample