Removed shape entity array as not needed