Use more accurate static data