organized and update hbm1 xml