Add hammerhead props

Change-Id: I53c0831aa3cc684a724fbd1c94a565413c093d70