Adding improvements to variables and base