Update for new maps compatibility