Updated modules to run with version 2.1