Added enum Types and enum Roles