Fix type hinting on MapInterface