Add support for read_only_fields