Updates to Hook Classes