Adding custom callback support.