Improved composer support