Added options fields