Add basic items list
Fix conflict
Added items data