Started adding support for namespacing (#4)