Removed -baseItem, -isBaseItem and made -sourceItem public instead