Added composer support