Var: replace struct by a pair