Updated TaskMap,UserMap