Use ListItem instead of String in some arrays
Handle parse errors in a cleaner way