Made callbacks injectable