Updates to adapter structure, active record implementation