Updated modules with latest resource repo changes