Moved hashing to dedicated module in data layer