Fix for new request structure