Updated to fix circular reference