Changed types in to an enum