Simplify TableOption logic