Replaced some raw pointers by optionals