Changes to reflect database and new adapters