Added factory template