Upgraded to ModeShape 3.8.0.Final