More intelligent import for shapes