Better param handling