Added factory helper method