Fix/Improve model insertion mechanism