Updated to use ModeShape 3.4.0.Final