Added more callbacks