Latest updates for saas stuff