Add remote item functinonality and small refactoring to resources.