Add option validation