Add some more callbacks