Added some optionals