Made some changes based on child requirements