More composition refactor.