Refactored dummy model objects