[FOLD] Update .cfg based on review comments