Removed dataService dependency, updated dependency on restricted objects