Refactor to have version in binary