Polish up the composition system