Restore some withData functionality