Added Smart Moving support.