Changed commands order to avoid duplicated persistence units