added support to forcing rebuild