Changed so that all files are using the configured values and not hardcoded values