Yes, it make sense. It's really import to reduce the conditional block level, and loosely coupled options check. I will reorganize them. Thanks!