Added options class