Added macro form type