Better client side circular dependency handling