Made responses generic - addresses #2