Updates data access to use 2.3 accessor functions