Updated Enum and UserSerice