modified entity classes and bean manli