Bump to edge lotus and refactor the mapping