Circular references support removed