Added state to issue, added some methods