Edits for Riverstone Plugin