Added a few classes to make options persistent