Object model for properties improved.