Updated match spec, added bout and result models