Changes to support file uploads