Updates and added callbacks