Add type checking on vandalen