Added missing changes related to last commit