DocBlock improvements