Add files support

Change-Id: I9f0daa23b8bbc7fa05ce857ab758a1e7bb1f2c98