Pre data access changes