Better composer support