Add more Circle support.