Improved composer integration