CLDIDE-2226: rework saas in accordance to meter based spec