Adding more optionals that I missed