Moved initial calls into promise from roster load