Add timouts for wait_events
Add unit display as marker