Add some more props

Change-Id: If4b0238279b60e3bd038aee917bf00f82defb148