Corrected service callbacks