Refactored all classses to use the resultitem class