MAS : Align code base with grid, support remote configurations