Add optional param to handle user() call