structered cmd line options and introduced new ones