Fixing Insert and Delete

Fixing Insert and Delete issues after the Generic Factory.