Make some changes for the ability to add databases through other plugins