various data access changes