FIXED: extend config