Added param validation