Added support for moving components