Add options class feature