Refactoring SRP to use an XC interface