More module additions and upgrades