Updated for new granular parameters
Added unspecified mode handling
Updated for handling more complex configuration parameters