Improved docblock support