WCM-146 refactor interface