Added changes to use Valdrin's DB