s: Add params support
s: Add params support, take II.