Updating various classes