Reverted the move to strings in favour of good ol' enums