Tag: composition improvements