GR 42 - restrict fields

@twinge, please review
Same question here about hash vs array.