[#LIB-155] Refactor configuration | nulls for maps supported