Made changes to relevant files so they use the salt