Improve binaries management