added roles, refactoring account service