Improve configurability & shrink container.