Improve a bit more movable objects in library