Make composer more descriptive

Change-Id: Ia8b9acda6b8116ea093bb6ca8302c9b038f2b992
Merge "Make composer more descriptive"