Circular reference issue resolved