[MOD] Factory implementation changed.