Rationalised the Incident object