Moved to method-based properties model.