#35 Composer support