DataSource API revamp WIP.