Add more controls on insert/updates