Updated maplists
Fix merge conflicts