Add more optionals attributes + documentation for them