Added missing required variables