Generic schema changed

Changes in the schema so we add more info on fields monitored.