Added ModeShape support