Additional files to make KVP work