Add validation files
Add misc members to Context