Adopt to newer mezzanine