Added default properties, but Default All property.
Some refactoring.