Refactor and update rc parameter control