Use Optionals instead of null pointer