Prep for Composer support