Redefine POM structure
Fix a non blocking and recurrent NPE
Fix occurrence modification and deletion operations