Added new classes for persistency and hbm files