[meta] Performance improvements