Add db creation and list fixes