#13: Replaced enums with enum classes