Added support for ";" in field list