Added lists and various enumerations instead of manual 1., 2. lines.