New pojo and hbm few deleted also