Updated to 9.0 macro interface