Update for incoming changes

Use new impl syntax