Implement better insert