Some of Repooc updates