Use concrete config classes instead of generic dictionary

Use concrete config classes instead of generic dictionary #5455