Adding namespace to dateapimanager & moving a helper function in it