Added missing variables from light version