Changed hooks into lists of hooks