Finished all remaining Factory implementations