updated to use modeshape commons for singularizing plurals