Added callback support