Update with new rsCommon functions