Add handling for properties