Use name as key instead of ID