Pass composer validate

Also improve the description

Change-Id: I7ea26ff7f6f4c927b7870a7dadba48a6b7404620