Yeah, I'm not really happy with the current exposed API.