Add remaining factory methods