WCM-188 More improvements