Additional changes to accept generic object types (instead of specific CPoint type)