Minor changes new factories