Improved precalculated data