Removed circular references for serialization