Added class Role
Added class Constants
Code improved
Update