Added supporting of remote database