Upgraded to use ModeShape 3.6.0.Final