More CONFIG Updates