0.50.1 - Continue with InsertFactory class