Added partial work for feature composition