Fixed calling, added namespacing