Updated to new Rayne API