Finalized all factory methods