Changed insert to be able to delete the optional fields