AccidentData model upgraded to more complex structure