Fix for request structure change