Items/MediaItems refactoring