Composer, updated from official repo