Always use ItemDataService, as we can't do the instanceof check

Always use ItemDataService, as we can't do the instanceof check #56