Switch to better looking API.