Fixed circular reference issue in JSON return