removed redunancy and clean up, add compartment lookup tables to ModelData.