Added composer support to first 2 bundles