reimplemented models, added hibernate and jackson model mappings