Added basic storage of variables