Improve some optionals.