bring back support for local data objects