Add a little doc and callbacks