Updated to support Mambu 3.6