updates to support old and new hash style