Var type checking added