Simplified the API a bit further.