Add Remote Database support