Got rid of extra options for custom enums to make life simpler