Update: improve create map