Updated to use ModeShape 3.3.0.Final