Work on managing native binaries