Reduce callback arguments to two and update documentation