Added doc blocks in newer classes