Updated functors.