rdoc added and various changes
Changed schema