Adding composer support

Change-Id: I8979f0865c8dfcde9846bbe1150056d383b92e99