Updated for MESH database