WPS Import refactor - dropped REST