Changed to use ModeShape 3.1.1.Final