Changes for post git migration