Added support for cyclic properties.
Fixes everywhere.