Added external shapes support.