Add last changes for persistance and JMS