Refactored and added the binary stub