Added salt support