Updated to support Mambu v3.5  (with review comments)