Controller cleanup

This adds the tag to the option struct as discussed.