Simplified the API, removed redundant "named" callbacks