Improve design. [WIP]