Slightly better toJSON handling in response