Added support for semicolon-separated values