Refactor proxy cmds