More improvements to composer