Better handling of the loader and the variables.