BS-9453 : modify object model

- Update server object model
- Updtae Hibernate mapping
- Modify Model convertor