Improve insert action