Move optional params into API base class