Add more options for validation (fixes gh-6)