Feature/switch to optionals