Added utility (makeMainReq). Changed hbm files