Refined existing DB check