Added curve support.