Add additional checks
Add URL support to grader