Move fillToZero to optional to be able to override them