Merge conflicts and updates
Allow setting any type as ConfigKey calue for type-coercion
WIP