SLA refactoring