Moved LLADDR into proper map with defaults