[REFACTOR] Simplify
[FEATURE] Require and filter params
[CLEANUP] Remove test property
[FEATURE] Escape params