Updated from language of vectors to maps