Updates for Zuyd integration