Updated namespace, added Docblocks