Added better ant type enumerations and legacy support