Move more deps to composer