Factory expansion

Factory expansion