Improve API design.