Improved pagination. Updated map handling.