Added more callback functionality