Added missing variables