Refactored SaaS application