Update and reorganize the areas list
Various optimizations