Finished the ENUM stuff