Refactored issue model and added new states