Added namespaces for function sanity, decide on this later