Add safer parameter handling, I just want strings