[BUGFIX] Re-add parsing for list elements