Removed dependency on map_list_of by using c++11 initializers