Point support (20/26)

Point support