Removed unnecessary fromNull method. Using Option(...) everywhere instead