There are a lot of new faces joining Once Upon a Time! The show announced during its San Diego Comic-Con panel on Saturday that Season 6 will kick off with an Aladdin (Deniz Akdeniz) and Jafar (Oded Fehr) storyline. Jafar was previously played by Lost alum Naveen Andrews in the Once spin-off Once Upon a Time in Wonderland.

Buffy the Vampire Slayer alum James Marsters will also join the show next season. His character was debuted via a Season 5 Blu-ray extra showing his character palling around the Underworld with Cruella de Vil (Victoria Smurfit).

Catch up on all the latest news from Comic-Con

In other teases, Colin O'Donoghue cautioned fans not to get too excited about a Hook and Emma (Jennifer Morrison) wedding. It was also revealed that the heroes will question what Hades (Greg Germann) told them about the Olympian Crystal in Season 5 — meaning there could be a way to bring Robin Hood (Sean Maguire) back from the dead after all.

Once Upon a Time ended last season by introducing "The Land of Untold Stories," which will open up the show to the possibility of brand new fairy tale characters. However, the latest person to join the OUAT family is Giles Matthey, who will guide Belle (Emilie de Ravin) and Rumple (Robert Carlyle) through a dream land as the Greek mythology figure Morpheus.

Season 6 of Once Upon a Time premieres Sept. 25 at 8/7c on ABC.