Replaced strings with enums