Updates to design after file split.