Include v1 files as well