Make more callbacks optional