Made the Configuration handling more generic.