Added support for building with binary