Switch from enums to string maps