Preparing for full composer support