Improve the Add/Insert to have more info.