Updated to use ModeShape 3.7.1.Final