More materialization

Change-Id: I71959e83dc1310674e6a24dbf43e6d8558f51e13