Updated package references. Changed builder slightly to use interfaces IContentService