Updated to use rsCommon