Adding some changes around order of loading and making the loading of Rich manual