Point support (25/26)

Point support