Added the defined variables because some of the code is using them now. I will be looking into this further and seeing if we should change this.