Moved parameters out to separate files