Changed schema to be a hash