fix:allow _data files to include other _data files

also refactored