Initial support

Remove unusable resource types
Change types, etc

Change-Id: I2deccdece2c7af25df3b9ab6865352348ff55d47