Improved version control compatibility