Added simulation class