Moved definitions in the download file