Added some docstring support