Some modifications to FieldService

To make it work and try to update