Updated completion to work with comma seperated list