Made classes proper enums