Added support for version and creationDate fields