Updated component with option validation