Updating with presence handler and necessary additions.