Added proper doc blocks