Design improvements on Event and Route properties