RailSysComposite and ScheduleComposite Listener improved