Changed the shape to support ports an components in components better