Adds site-fields and some others by Dave