Changed to use ModeShape 3.1.3.Final