Extend mapping
Fix issue with cyclic references during serialization