Improving callback support and documentation