Adding changes to convert enum as a public class