Updates for changed Rayne API