Add two point support