added and renamed some fields