More sources

Change-Id: Iefebbe81bc701ae7e6d007c1a1018fcbeb300a42