Went from using State::release/insertEntity to State::moveEntity