Extended Move Support to Other Shapes, Added Resize Support