added changes to standalone for modeshape