Updated wan and Optionable classes
Updated wan and Optionable classes