Change callback signatures to pass down context where applicable

Change callback signatures to pass down context where applicable #509