Adding hasOption
Upgrade options usage
Adding table id and class