Item and Item+AddOn

Refactored Item for core data