Additional updates for factory changes, issue #151.