Add options and fields as seperate arrays in Message