Updated the fromString method for the Enums in the aft-common Entities