Updating and adding extra functionality