More data events, clause additions