Use Key instead of Name for properties