Rename opts.id to opts.keys
Fix Property.mapsTo for keys