Added ms fields to inheritance macros