changed data handler for new map definitions