Moved role management to user module from system module