Added checking for kwargs params