Added support for proper salts.