Removed namespaces and explicitly stating it on every function use