Point support (22/26)

Point support