Added param handling