Replace Complex Creation with Factory Method