Adding missing callbacks