Improved DocBlocks