Cheating towards the libraries: only adding variables when needed