Update schema

Change-Id: I43f0eba57cdb82b62536bfcf9ba60d3d1dd2d857