Use enums instead of strings