Improved doc blocks