new contamination class structure, added model-based simulation