Add additional checks of input parameters