Extend HACK to the rest of files..