Removed more duplication between adding exit and item fields