De'opts' and de'id'fied - Using Opt() and Id() instead of 

- term() is not needed anymore, using Id() and Opt() instead