Changed argument parsing to allow conditional base conf