Added circle annotation support