More clean up
More docblocks
Docblock for addExtension