Add support for cyclic schemas