Add some changes on page module