Added FA Map and discretization