DataSource API revamp.