Refactor towards usage of JMS Serializer