Fixed 27 (Allow adding of variables) and 28 (Allow deleting of variables)