Updated modules to new API.