Adding fields according to the thesis