Simplified the API a lot.