Added callbacks options
Fixed typo
Merging callbacks change