Refactored Defaults Models