Added typecheck wrapper for driver