Add circle shape support