Upgraded to ModeShape 3.6.0.Final