added enhanced class and reflected change