[WIP] Composer support