Added callbacks support