Refactoring of the data shim layer