Changed enum style to non string enum