Made the no-CD check DB agnostic