--plugin and --option enhanced support