Additional changes to address 405 error.