Make hw files more generic.