Introducing some changes for new doc