Add copying of variables