Simplification of code
Fixed field update: now computes field index statically
Fixed annotation assignmment