Added option validation