Added support for binaries