Updating the necessary classes