Further simplified the APIs.
Flux is WIP.