Improved docs
New namespace