Added validate and prevalidate to options