Added new fields to issue model and fixed minor issues