Added catching of raw fields
Added some new stuff