Add custom spec
Modify validator implementing