Added single and multiple taxonomy option fields