Improve moving objects in library behavior.