Added support for person/document