Wiring in handlers
Handle docstring case
Nicer :docstring handling
Better builder dispatch