Some work on ContentRepository