Initial support for extra-files