Refactored responses