Minor changes
Adoptiongs for doc generator