Adjust to simpler interfaces