Changed all modules to pointer types.