More db manager reworking