Add info for arch
Some refac