Add field selection with macros