FIX - Add @options to all methods.