Added support for forcing build