Add support for struct_map recursive structure and files