Move additional logic into RH obj