Better callback format
1.0.1