Update CB dependency to latest snapshot
Permissions stuff
Some class changes