Moved shape to imports in Description