Added support for adding arrays of shapes