Updated parameters to not be null by default