Refactored domain classes for changing hbm to annotation for pswd services