Updated some string params to make them optional, where applicable.