[FIX] storage now use JBoss marshaller
[FIX] improve interleaving in Atomic