Added compound formatting support