allow specifying stonename and make sure it persist for update