Added callback support functionality