Track adds and updates, fix constraint bug