added remaining factory classes