Enhancement: allow comma-separated value