Continue to refactor Rapid Reseller