Replaced fromNull with Option(...)