Changed contribution variables
Optimized shape, materialmodel, and mpmutils