Update code for accessors generation