Add docblock
Better autoload inclusion