Added class points in Points tab.
Added class points in Points tab v2
Merge conflicts resolved