Refactored DefaultResultFactory