DataSource event API revamp.