modeshape-related additions