updates to also support databases