Refactor Response model self-referential associations