Data abstraction layer changes