Refactor to decouple namespaces from each other