add sub version support and modify option name