Improved management of points