Moving the single-tenant app to a multi-tenant scenario