Added more required classes, created a class for Enums.