Change to use Request object