Added support for ContentObject
14 files changed