First draft at using jmsserializer
Refactoring