Add commenting for some classes