Add support for vocab and map files