Prepare for composer support

Change-Id: I77becf4b2ae7907e693ed84745d297dde8faaebe