Change to non-Linked type in map