Added support for new Raids