Edited Html and added Enum classes