Parsed params DRY fix