Converted to toen objects from enum