Finishing (for now) the data catalog section