Moved options class