Updating to latest lift based impl