Converted to new hash style