Added subject and enum