Improve namespacing
Further documentation