Adjustments to handle point-to-wadl method