Fixes #3831 - Add support for hash type