Updated docs and added callbacks