Better extraction of factory value
1.0.4