Updated cascades to pull out the prop creation for other uses