Added more changes to integrate with git