Added spoilers support