Modified additional factory logic.