Using option instead of null