ADDED: Callback support