Added Insert/Update for Waiters