Simplify callback
Update API doc