Revise rhc wrapper to pass all args through function