Refactor for using alchemy/binary-driver