Update lists after PR #22