First part of fix DB parsing...