Added variable to consider system names with dots