Update modules, use aws controller