Chnged class and aspect to be enums instead.