Better alignment with JBoss Fuse 6.0 Beta