Changed to use ModeShape 3.5.0.Final