Switching to prop

Change-Id: Ib9e2541aca806a9053697fdb09c37f64e8aa3d0e