Updated base configuration