Added missing callbacks