Introduce factory 2.1 version