Modified all local operations to work with new DataSource architecture.