Improve RFC command