WCM-188 Some important improvements