Add Queen support