Added (again) composer support