Added more flexibility in *.kv filenames