Maphandler now only creates 1 list of objects