Add better variable handling class.