Solve circular references issue