Refactored server-side insfrastructure to async