Add functionality for optionals.