[#XDS-206] Refactor configuration | cdi support for preferences