Add support for extra-paths