Added update and insert capability