Moved all responses to factory closures