Added factory method with PSSchema