Fixed compatibility with the reworked database classes
Improved shutdown behavior of the adapter