Tweak code, finalize new fields refactor