Add state to comments