Response refactor, troia-227