Refactored Dummy factory