Update to work with git