Add support for incremental updates

Change-Id: I77bc14d251eb3deccdde24e1dcb3bc1b653bd65a