ARIES-1071 Modelling performance improvements

git-svn-id: https://svn.apache.org/repos/asf/aries/trunk@1483849 13f79535-47bb-0310-9956-ffa450edef68