Modify Factory package

Modify Factory package