Added state and comment to responses