Contrib module additions and upgrades