Removed model validation, fixed item comparison