Moved addShape from world to common