Incorporation of Rayne API changes