Update lists after PR #17