Updated list and definitions