WIP - refactoring RepositoryItem