adapt to saas-5