Refactoring
Added user type